so I though merge conflicts were over, but no. Mor conflicts removed