code as of 15th may 2014 9:57 after a  the merge conflict

code as of 15th may 2014 9:57 after a  the merge conflict