Fixing merge conflicts :(