Update ignore file, add merges folder