adding tests for users being signed out
merging files
sorting merge conflicts