ignore out folder
resolve conflict