fixex conflicts and removed unwanted code from homepage