Ignore some maven temporary files which are part of releasing
Remove merge fail stuff