width fixed to 50%
resolve conflict
resolve conflict