Still some issues (merge not working).