Ignore files and resolve conflicts