Added files with resolved conflicts from master