Proper merge, hopefully..