A merge conflict

Loading the class