Added multiline field
fix merge conflict