fix merge conflict during pull