Fix merge problem
Adding second marble