resolve the confliction in home page