Conflict resolution

clearfix added by two persons at the same time