main activity modified with conflict changes