Made Second Edit
Merge Fix