Change home color
Fix merge confilct