logging in changes
merger conflict in layouts file