layout responsive
resolving conflicts