fixing home page redirect
conflicts