merge function for easy fix
conflict pc