Repositioned 'Sign Out' link to be on the end
Resolving conflicts