Fixes merging errors