Small commit with stupid mergeing error to master