* Fix merge issues