Fixes Merge Conflict from Master Tracking