Resolve conflict :D