merged conflits and ready to update master.