ignore queue files
merging conflicts