Removed merge problem
Fixed home page error