Oops. Looks like you accidentally checked in a conflict.