Resolving some conflicts inorder to do a pull
forgot to commit these