only the staged files i hope, others had conflicts