Made git forget about some files
Pulled and resolved a conflict