First branch commit 1
Fixed conflict
Final changes to 1
Fixed some conflicts