THE architects of a £300m marina and "harbour village" on the Firth of Forth have been sent back to the drawing board over a potential clash with the city's new tram route.

While Granton Central Developments' masterplan has been approved after a series of revisions, the developer has been told to re-draw aspects so they don't overlap with future construction of Edinburgh Trams.

The architects have been told to to "amend the design to reflect the tram track or pay for the tram design to be amended".

It is claimed the marina project will create 900 new jobs and see 2,000 homes built.

The Granton Harbour Masterplan was approved and its individual sites at the development are now going through the planning process.

The plan includes a boatyard and associated infrastructure for a new 300 berth Edinburgh Marina complex.

It also includes a new shopping and leisure centre, as well as the new homes.

It is claimed that the marina will be the focal point for the successful regeneration of Granton.

One of the benefits associated with of the Granton Central Developments plan include provision of new transport facilities, including the possibility of a £145m extension of the city's tram service to Granton, as had originally been planned.

Edinburgh Trams said there is "a potential conflict if both sites were to be developed at the same time". Both would sit along West Harbour Road .

Planning officials said in the latest report this week: "There are a number of issues which conflict with the current design and operation of the tram.

"These should be addressed in future application submissions.

"The boundaries of the development are on the 'limits of deviation' and there is potentially a conflict if the two are constructed at the same time.

"An additional road crossing is shown to the east of Chestnut Street which is not on the current tram design.

"As a consequence of the above, the proximity of the road crossings to each other at this location gives cause for concern, particularly if they are signalised.

"In addition, the developer will be required to amend the design to reflect the tram track or pay for the tram design to be amended.

"The development drawing does not reflect the proposed position of Granton tram stop and the adjacent tracks with overhead equipment, footway and soft landscaping.

"The detailed drawings will be required to reflect the proposed position of the platform."

Kevin Fawcett, of Granton Central Developments Ltd, said: The masterplan consent at this stage is subject to adaptive changes as further detailed applications are submitted by GCDL on a site by site basis.

"All further detailed applications are in consultation with City of Edinburgh Council planners and their advisors."

He said the matters highlighted will be "resolved during such future consultations".

As well as the marina facilities and homes, it is also hoped to have a hotel and serviced apartments at the Granton waterfront development.

An inquiry into the first part of the tram line, from Edinburgh Airport to York Place, is ongoing and its chairman, Lord Hardie, will begin hearing evidence in public later this year.

The first trams started running in 2014, with the project eventually costing £776m, well above the original estimate of £545m, with the first trams arriving three years late.