Fixed some minor confilcts