Fixed weird merge behaviour
Deleted patch file