BUGFIX: Merge issues