Errors gefixt en merge conflicts gefixt.