Fixed after conflict