Solved a merge conflict.