changed header
resolved conflit
notes added