Fixes errors due to merge conflict