Fixes problem when merging