Fixes committed merge conflict