Fixed commit

Fixed merge conflict by ignoring change.