merged conflicting local changes with remote master - mostly fixed broken img tags