Fixes error during merge