General cleanup, + conflict code bug fixed
General cleanup, + conflict bug fixed