Revert "Handeled last merge conflict"

This reverts commit 631e49ac3e681bda970de517176e377df3e5684e.