re-commtiting earlier files – now without psd
resolving conflicts