FirstActivity was created
Resolved conflict