Deleted package mockclasses, merging issue solved