/**
 * Created by Martin on 03.09.2016.
 */
public class Test {
    public static void main(String[] args) {
        System.out.println("GitHub test");
    }
}

/**
 * Created by Martin on 03.09.2016.
 */
public class Test {
    public static void main(String[] args) {
        System.out.println("GitHub test");
		System.out.println("Local edit");
    }
}

Resolve conflict