It seems like adambard added this line '+<<<<<<< HEAD' so that the server can automatically update.