Forgotten merge conflict.