package piftik.github.com.experementsgithub;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

public class MainActivity extends AppCompatActivity {

    @Override
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
//        first change
//        change to conflict
//        too more change
    }
    public void firstMethodToConflict(){
        int some;
    }

    public void methodToConflictSecond() {
//        some comment
    }
}

package piftik.github.com.experementsgithub;

import android.os.Bundle;
import android.support.v7.app.*;

public class MainActivity extends AppCompatActivity {

    @Override
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);
//        first change
//        change to conflict
//        too more change
    }
    public void firstMethodToConflict(){
        int some;
    }

    public void methodToConflictSecond() {
//        some comment
    }
}

change import