Final fix to conflict

this should fix all conflicts cause by unsynced changes