Fixed merge conflict with main repository