Fixing side scroll?
resolving merge confilicts