more merge conflicts fixed. its late :(