Fixed a bug
Fixed conflict
Final changes to 1