Damn conflict shit

asdasd