resolving some merge issues!