wtf I cannot into git

Why is it trying to replace the entire file with the entire file
Merge branch 'master' of https://github.com/Gibstick/DiscoSheep

Conflicts:
	src/gibstick/bukkit/discosheep/DiscoParty.java