Delete .bags.ini (CaDDaM XyceuH's conflicted copy 2014-03-03 (1)).swp