Fix Merge Conflict and if condition