fixing raphael unresolved merge